From: Gert Wollny Date: Thu, 9 Aug 2018 21:43:51 +0000 (+0200) Subject: d/p/03: Correct install path X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~198 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ce7924e1c6ece1da526103f7aef21fe93d18813a;p=dcmtk.git d/p/03: Correct install path --- diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch index 43eac54f..ad6e4de7 100644 --- a/debian/patches/03_datadic_install.patch +++ b/debian/patches/03_datadic_install.patch @@ -35,7 +35,7 @@ Author: Mathieu Malaterre @@ -1,5 +1,8 @@ # declare installation files -INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data) -+SET(DCMTK_INSTALL_DATDIR "share/dcmtk${DCMTK_ABI_VERSION}") ++SET(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}") + +INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data) +INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data) diff --git a/debian/rules b/debian/rules index 3a324bd8..dd45af01 100755 --- a/debian/rules +++ b/debian/rules @@ -62,8 +62,6 @@ override_dh_auto_test-indep: override_dh_auto_install-arch: dh_auto_install - # ?? - mv debian/tmp/usr/etc debian/tmp/ override_dh_auto_install-indep: DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install